Don't let the priv->image pointer dangle. (#136259, Padraig O'Briain)

Fri Mar  5 22:37:15 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkbutton.c (gtk_button_construct_child): Don't let
	the priv->image pointer dangle.  (#136259, Padraig O'Briain)

diff --git a/ChangeLog b/ChangeLog
index b79cdb36a892f570cb941e79df8eb6b4e49c0052..37be98c5f08605d1755e5531d90c04d3f909dbd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  5 22:37:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkbutton.c (gtk_button_construct_child): Don't let
+       the priv->image pointer dangle.  (#136259, Padraig O'Briain)
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b79cdb36a892f570cb941e79df8eb6b4e49c0052..37be98c5f08605d1755e5531d90c04d3f909dbd7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Mar  5 22:37:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkbutton.c (gtk_button_construct_child): Don't let
+       the priv->image pointer dangle.  (#136259, Padraig O'Briain)
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b79cdb36a892f570cb941e79df8eb6b4e49c0052..37be98c5f08605d1755e5531d90c04d3f909dbd7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Mar  5 22:37:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkbutton.c (gtk_button_construct_child): Don't let
+       the priv->image pointer dangle.  (#136259, Padraig O'Briain)
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b79cdb36a892f570cb941e79df8eb6b4e49c0052..37be98c5f08605d1755e5531d90c04d3f909dbd7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Mar  5 22:37:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkbutton.c (gtk_button_construct_child): Don't let
+       the priv->image pointer dangle.  (#136259, Padraig O'Briain)
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b79cdb36a892f570cb941e79df8eb6b4e49c0052..37be98c5f08605d1755e5531d90c04d3f909dbd7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Mar  5 22:37:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkbutton.c (gtk_button_construct_child): Don't let
+       the priv->image pointer dangle.  (#136259, Padraig O'Briain)
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 6a0869068fbddf9841d42c917ad332eab4d204e9..84ea2bb562b06fb2fd66271faa46cb524607911a 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -586,8 +586,11 @@ gtk_button_construct_child (GtkButton *button)
     return;
 
   if (GTK_BIN (button)->child)
-    gtk_container_remove (GTK_CONTAINER (button),
-                         GTK_BIN (button)->child);
+    {
+      gtk_container_remove (GTK_CONTAINER (button),
+                           GTK_BIN (button)->child);
+      priv->image = NULL;
+    }
   
   if (button->use_stock &&
       gtk_stock_lookup (button->label_text, &item))